From: Sandro Knauß <hefee@debian.org>
Date: Sat, 3 May 2025 20:46:28 +0000 (+0200)
Subject: Update patch hunks.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~10
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=652e420e03bbedf5ed28b81a9039ef78cac94007;p=nextcloud-desktop.git

Update patch hunks.
---

diff --git a/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch b/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
index cfdeafbc8..7a502f27f 100644
--- a/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
+++ b/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
@@ -49,10 +49,10 @@ index 8f319a3..b68eb31 100644
    return 0;
  }
 diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
-index ce8ef8d..e55edfa 100644
+index a97585a..769a559 100644
 --- a/src/libsync/discovery.cpp
 +++ b/src/libsync/discovery.cpp
-@@ -1116,10 +1116,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+@@ -1117,10 +1117,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
          if (_queryLocal != NormalQuery && _queryServer != NormalQuery)
              recurse = false;
  
@@ -61,9 +61,9 @@ index ce8ef8d..e55edfa 100644
 -        }
 -
          if ((item->_direction == SyncFileItem::Down || item->_instruction == CSYNC_INSTRUCTION_CONFLICT || item->_instruction == CSYNC_INSTRUCTION_NEW || item->_instruction == CSYNC_INSTRUCTION_SYNC) &&
+                 item->_direction != SyncFileItem::Up &&
                  (item->_modtime <= 0 || item->_modtime >= 0xFFFFFFFF)) {
-             item->_instruction = CSYNC_INSTRUCTION_ERROR;
-@@ -1147,13 +1143,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+@@ -1149,13 +1145,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
              }
          }
  
@@ -78,7 +78,7 @@ index ce8ef8d..e55edfa 100644
          processFileFinalize(item, path, recurse, recurseQueryLocal, recurseQueryServer);
      };
 diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
-index 469dec3..4e15331 100644
+index 9b72732..51813ae 100644
 --- a/src/libsync/discoveryphase.cpp
 +++ b/src/libsync/discoveryphase.cpp
 @@ -371,7 +371,6 @@ void DiscoverySingleLocalDirectoryJob::run() {
@@ -102,10 +102,10 @@ index 0c9edce..913f37f 100644
  };
  
 diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
-index 8361d8a..49900b3 100644
+index 3150819..28c3533 100644
 --- a/src/libsync/filesystem.cpp
 +++ b/src/libsync/filesystem.cpp
-@@ -482,7 +482,6 @@ bool FileSystem::setFolderPermissions(const QString &path,
+@@ -507,7 +507,6 @@ bool FileSystem::setFolderPermissions(const QString &path,
          case OCC::FileSystem::FolderPermissions::ReadOnly:
              break;
          case OCC::FileSystem::FolderPermissions::ReadWrite:
@@ -114,10 +114,10 @@ index 8361d8a..49900b3 100644
              break;
          }
 diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
-index 04e556f..d4382f6 100644
+index 480baa8..220d7f7 100644
 --- a/src/libsync/owncloudpropagator.cpp
 +++ b/src/libsync/owncloudpropagator.cpp
-@@ -1472,9 +1472,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
+@@ -1470,9 +1470,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
                  try {
                      if (FileSystem::fileExists(propagator()->fullLocalPath(_item->_file))) {
                          FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_file), FileSystem::FolderPermissions::ReadOnly);
@@ -133,7 +133,7 @@ index 04e556f..d4382f6 100644
                      }
                  }
                  catch (const std::filesystem::filesystem_error &e)
-@@ -1498,13 +1504,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
+@@ -1496,13 +1502,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
              } else {
                  try {
                      if (FileSystem::fileExists(propagator()->fullLocalPath(_item->_file))) {
@@ -153,10 +153,10 @@ index 04e556f..d4382f6 100644
                      }
                  }
 diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
-index 24c86a7..2ffcb4b 100644
+index e24ce8a..8237905 100644
 --- a/src/libsync/syncengine.cpp
 +++ b/src/libsync/syncengine.cpp
-@@ -363,10 +363,6 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
+@@ -362,10 +362,6 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
                  const bool isReadOnly = !item->_remotePerm.isNull() && !item->_remotePerm.hasPermission(RemotePermissions::CanWrite);
                  modificationHappened = FileSystem::setFileReadOnlyWeak(filePath, isReadOnly);
              }